finalized all sorts of things throughout the project... incapsulated methods in controller class