diff --git a/trovebox/.pylint-ignores.patch b/trovebox/.pylint-ignores.patch
index 3ab31d9..24996b7 100644
--- a/trovebox/.pylint-ignores.patch
+++ b/trovebox/.pylint-ignores.patch
@@ -1,48 +1,60 @@
 diff --unified --recursive '--exclude=.pylint-ignores.patch' original/api/api_activity.py patched/api/api_activity.py
---- original/api/api_activity.py	2013-09-02 21:17:41.848947000 +0100
-+++ patched/api/api_activity.py	2013-09-02 21:18:19.701134833 +0100
-@@ -22,7 +22,7 @@
+--- original/api/api_activity.py
++++ patched/api/api_activity.py
+@@ -33,7 +33,7 @@
              raise TroveboxError("Purge response returned False")
          return True
  
--class ApiActivity(object):
-+class ApiActivity(object): # pylint: disable=R0903
+-class ApiActivity(ApiBase):
++class ApiActivity(ApiBase): # pylint: disable=too-few-public-methods
      """ Definitions of /activity/ API endpoints """
-     def __init__(self, client):
-         self._client = client
+     def view(self, activity, **kwds):
+         """
 diff --unified --recursive '--exclude=.pylint-ignores.patch' original/api/api_album.py patched/api/api_album.py
---- original/api/api_album.py	2013-09-02 21:17:41.848947000 +0100
-+++ patched/api/api_album.py	2013-09-02 21:18:19.701134833 +0100
-@@ -4,7 +4,7 @@
- from trovebox.objects.album import Album
+--- original/api/api_album.py
++++ patched/api/api_album.py
+@@ -8,7 +8,7 @@
  from trovebox import http
+ from .api_base import ApiBase
  
--class ApiAlbums(object):
-+class ApiAlbums(object): # pylint: disable=R0903
+-class ApiAlbums(ApiBase):
++class ApiAlbums(ApiBase): # pylint: disable=too-few-public-methods
      """ Definitions of /albums/ API endpoints """
+     def list(self, **kwds):
+         """
+diff --unified --recursive '--exclude=.pylint-ignores.patch' original/api/api_base.py patched/api/api_base.py
+--- original/api/api_base.py
++++ patched/api/api_base.py
+@@ -2,7 +2,7 @@
+ api_base.py: Base class for all API classes
+ """
+ 
+-class ApiBase(object):
++class ApiBase(object): # pylint: disable=too-few-public-methods
+     """ Base class for all API objects """
      def __init__(self, client):
          self._client = client
 diff --unified --recursive '--exclude=.pylint-ignores.patch' original/api/api_tag.py patched/api/api_tag.py
---- original/api/api_tag.py	2013-09-02 21:17:41.848947000 +0100
-+++ patched/api/api_tag.py	2013-09-02 21:18:19.705134853 +0100
-@@ -4,7 +4,7 @@
- from trovebox import http
+--- original/api/api_tag.py
++++ patched/api/api_tag.py
+@@ -5,7 +5,7 @@
  from trovebox.objects.tag import Tag
+ from .api_base import ApiBase
  
--class ApiTags(object):
-+class ApiTags(object): # pylint: disable=R0903
+-class ApiTags(ApiBase):
++class ApiTags(ApiBase): # pylint: disable=too-few-public-methods
      """ Definitions of /tags/ API endpoints """
-     def __init__(self, client):
-         self._client = client
+     def list(self, **kwds):
+         """
 diff --unified --recursive '--exclude=.pylint-ignores.patch' original/auth.py patched/auth.py
---- original/auth.py	2013-09-02 21:17:41.848947000 +0100
-+++ patched/auth.py	2013-09-02 21:18:19.705134853 +0100
+--- original/auth.py
++++ patched/auth.py
 @@ -4,7 +4,7 @@
  from __future__ import unicode_literals
  import os
  try:
 -    from configparser import ConfigParser # Python3
-+    from configparser import ConfigParser # Python3 # pylint: disable=F0401
++    from configparser import ConfigParser # Python3 # pylint: disable=import-error
  except ImportError:
      from ConfigParser import SafeConfigParser as ConfigParser # Python2
  try:
@@ -51,10 +63,10 @@ diff --unified --recursive '--exclude=.pylint-ignores.patch' original/auth.py pa
      import StringIO as io # Python2
  
 -class Auth(object):
-+class Auth(object): # pylint: disable=R0903
++class Auth(object): # pylint: disable=too-few-public-methods
      """OAuth secrets"""
 -    def __init__(self, config_file, host,
-+    def __init__(self, config_file, host, # pylint: disable=R0913
++    def __init__(self, config_file, host, # pylint: disable=too-many-arguments
                   consumer_key, consumer_secret,
                   token, token_secret):
          if host is None:
@@ -63,33 +75,31 @@ diff --unified --recursive '--exclude=.pylint-ignores.patch' original/auth.py pa
      parser.optionxform = str # Case-sensitive options
      try:
 -        parser.read_file(buf) # Python3
-+        parser.read_file(buf) # Python3 # pylint: disable=E1103
++        parser.read_file(buf) # Python3 # pylint: disable=maybe-no-member
      except AttributeError:
          parser.readfp(buf) # Python2
  
 diff --unified --recursive '--exclude=.pylint-ignores.patch' original/http.py patched/http.py
---- original/http.py	2013-09-02 21:17:41.848947000 +0100
-+++ patched/http.py	2013-09-02 21:18:25.749164824 +0100
-@@ -7,18 +7,18 @@
+--- original/http.py
++++ patched/http.py
+@@ -7,7 +7,7 @@
  import requests_oauthlib
  import logging
  try:
 -    from urllib.parse import urlparse, urlunparse # Python3
-+    from urllib.parse import urlparse, urlunparse # Python3 # pylint: disable=F0401,E0611
++    from urllib.parse import urlparse, urlunparse # Python3 # pylint: disable=import-error,no-name-in-module
  except ImportError:
      from urlparse import urlparse, urlunparse # Python2
  
- from trovebox.objects.trovebox_object import TroveboxObject
--from .errors import *
-+from .errors import * # pylint: disable=W0401
+@@ -16,9 +16,9 @@
  from .auth import Auth
  
  if sys.version < '3':
 -    TEXT_TYPE = unicode
-+    TEXT_TYPE = unicode # pylint: disable=C0103
++    TEXT_TYPE = unicode # pylint: disable=invalid-name
  else: # pragma: no cover
 -    TEXT_TYPE = str
-+    TEXT_TYPE = str # pylint: disable=C0103
++    TEXT_TYPE = str # pylint: disable=invalid-name
  
  DUPLICATE_RESPONSE = {"code": 409,
                        "message": "This photo already exists"}
@@ -98,28 +108,19 @@ diff --unified --recursive '--exclude=.pylint-ignores.patch' original/http.py pa
                          }
  
 -    def __init__(self, config_file=None, host=None,
-+    def __init__(self, config_file=None, host=None, # pylint: disable=R0913
++    def __init__(self, config_file=None, host=None, # pylint: disable=too-many-arguments
                   consumer_key='', consumer_secret='',
                   token='', token_secret='', api_version=None):
  
 diff --unified --recursive '--exclude=.pylint-ignores.patch' original/__init__.py patched/__init__.py
---- original/__init__.py	2013-09-02 21:17:41.848947000 +0100
-+++ patched/__init__.py	2013-09-02 21:18:19.705134853 +0100
-@@ -2,7 +2,7 @@
- __init__.py : Trovebox package top level
- """
- from .http import Http
--from .errors import *
-+from .errors import * # pylint: disable=W0401
- from ._version import __version__
- from trovebox.api import api_photo
- from trovebox.api import api_tag
+--- original/__init__.py
++++ patched/__init__.py
 @@ -12,7 +12,7 @@
  
  LATEST_API_VERSION = 2
  
 -class Trovebox(Http):
-+class Trovebox(Http): # pylint: disable=R0902
++class Trovebox(Http): # pylint: disable=too-many-instance-attributes
      """
      Client library for Trovebox
      If no parameters are specified, config is loaded from the default
@@ -128,82 +129,57 @@ diff --unified --recursive '--exclude=.pylint-ignores.patch' original/__init__.p
          even if the Trovebox API is updated to a new revision.
      """
 -    def __init__(self, config_file=None, host=None,
-+    def __init__(self, config_file=None, host=None, # pylint: disable=R0913
++    def __init__(self, config_file=None, host=None, # pylint: disable=too-many-arguments
                   consumer_key='', consumer_secret='',
                   token='', token_secret='',
                   api_version=None):
 diff --unified --recursive '--exclude=.pylint-ignores.patch' original/main.py patched/main.py
---- original/main.py	2013-09-02 21:17:41.852947000 +0100
-+++ patched/main.py	2013-09-02 21:18:19.705134853 +0100
+--- original/main.py
++++ patched/main.py
 @@ -26,7 +26,7 @@
  
  #################################################################
  
 -def main(args=sys.argv[1:]):
-+def main(args=sys.argv[1:]): # pylint: disable=R0912,C0111
++def main(args=sys.argv[1:]): # pylint: disable=too-many-branches
+     """Run the commandline script"""
      usage = "%prog --help"
      parser = OptionParser(usage, add_help_option=False)
-     parser.add_option('-c', '--config', help="Configuration file to use",
-@@ -84,13 +84,13 @@
+@@ -85,11 +85,11 @@
              sys.exit(1)
  
      if options.method == "GET":
 -        result = client.get(options.endpoint, process_response=False,
-+        result = client.get(options.endpoint, process_response=False, # pylint: disable=W0142
++        result = client.get(options.endpoint, process_response=False, # pylint: disable=star-args
                              **params)
      else:
          params, files = extract_files(params)
 -        result = client.post(options.endpoint, process_response=False,
-+        result = client.post(options.endpoint, process_response=False, # pylint: disable=W0142
++        result = client.post(options.endpoint, process_response=False, # pylint: disable=star-args
                               files=files, **params)
--        for f in files:
-+        for f in files: # pylint: disable=C0103
-             files[f].close()
- 
-     if options.verbose:
-diff --unified --recursive '--exclude=.pylint-ignores.patch' original/objects/photo.py patched/objects/photo.py
---- original/objects/photo.py	2013-09-02 19:48:44.862482000 +0100
-+++ patched/objects/photo.py	2013-09-02 21:18:29.001180950 +0100
-@@ -1,4 +1,4 @@
--"""
-+""" # pylint: disable=R0801
- Representation of a Photo object
- """
- from trovebox.errors import TroveboxError
+         for file_ in files:
+             files[file_].close()
 diff --unified --recursive '--exclude=.pylint-ignores.patch' original/objects/tag.py patched/objects/tag.py
---- original/objects/tag.py	2013-09-02 21:17:41.852947000 +0100
-+++ patched/objects/tag.py	2013-09-02 21:18:19.705134853 +0100
-@@ -1,8 +1,8 @@
--"""
-+""" # pylint: disable=R0801
+--- original/objects/tag.py
++++ patched/objects/tag.py
+@@ -2,7 +2,7 @@
  Representation of a Tag object
  """
  try:
 -    from urllib.parse import quote # Python3
-+    from urllib.parse import quote # Python3 # pylint: disable=F0401,E0611
++    from urllib.parse import quote # Python3 # pylint: disable=import-error,no-name-in-module
  except ImportError:
      from urllib import quote # Python2
  
 diff --unified --recursive '--exclude=.pylint-ignores.patch' original/objects/trovebox_object.py patched/objects/trovebox_object.py
---- original/objects/trovebox_object.py	2013-09-02 21:17:41.852947000 +0100
-+++ patched/objects/trovebox_object.py	2013-09-02 21:18:19.705134853 +0100
-@@ -1,10 +1,10 @@
- """
- Base object supporting the storage of custom fields as attributes
- """
--class TroveboxObject(object):
-+class TroveboxObject(object): # pylint: disable=R0903
+--- original/objects/trovebox_object.py
++++ patched/objects/trovebox_object.py
+@@ -5,7 +5,7 @@
      """ Base object supporting the storage of custom fields as attributes """
      def __init__(self, trovebox, json_dict):
+         self._type = "None"
 -        self.id = None
-+        self.id = None # pylint: disable=C0103
++        self.id = None # pylint: disable=invalid-name
          self.name = None
          self._trovebox = trovebox
          self._json_dict = json_dict
-diff --unified --recursive '--exclude=.pylint-ignores.patch' original/_version.py patched/_version.py
---- original/_version.py	2013-09-02 21:17:41.852947000 +0100
-+++ patched/_version.py	2013-09-02 21:18:19.705134853 +0100
-@@ -1,2 +1,2 @@
--
-+ # pylint: disable=C0111
- __version__ = "0.5"
diff --git a/trovebox/__init__.py b/trovebox/__init__.py
index 9189d35..73e2af5 100644
--- a/trovebox/__init__.py
+++ b/trovebox/__init__.py
@@ -2,7 +2,7 @@
 __init__.py : Trovebox package top level
 """
 from .http import Http
-from .errors import *
+from .errors import TroveboxError, TroveboxDuplicateError, Trovebox404Error
 from ._version import __version__
 from trovebox.api import api_photo
 from trovebox.api import api_tag
diff --git a/trovebox/_version.py b/trovebox/_version.py
index ad57014..baa0f41 100644
--- a/trovebox/_version.py
+++ b/trovebox/_version.py
@@ -1,2 +1,2 @@
-
+"""Current version string"""
 __version__ = "0.5"
diff --git a/trovebox/http.py b/trovebox/http.py
index ffeb487..30e342e 100644
--- a/trovebox/http.py
+++ b/trovebox/http.py
@@ -12,7 +12,7 @@ except ImportError:
     from urlparse import urlparse, urlunparse # Python2
 
 from trovebox.objects.trovebox_object import TroveboxObject
-from .errors import *
+from .errors import TroveboxError, Trovebox404Error, TroveboxDuplicateError
 from .auth import Auth
 
 if sys.version < '3':
diff --git a/trovebox/main.py b/trovebox/main.py
index b9b9f4f..081597c 100644
--- a/trovebox/main.py
+++ b/trovebox/main.py
@@ -27,6 +27,7 @@ To get your credentials:
 #################################################################
 
 def main(args=sys.argv[1:]):
+    """Run the commandline script"""
     usage = "%prog --help"
     parser = OptionParser(usage, add_help_option=False)
     parser.add_option('-c', '--config', help="Configuration file to use",
@@ -90,8 +91,8 @@ def main(args=sys.argv[1:]):
         params, files = extract_files(params)
         result = client.post(options.endpoint, process_response=False,
                              files=files, **params)
-        for f in files:
-            files[f].close()
+        for file_ in files:
+            files[file_].close()
 
     if options.verbose:
         print("==========\nMethod: %s\nHost: %s\nEndpoint: %s" %