Deleted views. Added comments. Cleaned up formatting. Added todo's for refactoring.