Remove add view and code cleanup (pep8, pep257)