Cleaned some methods and changed view