Cleaned up variables and methods in Views