Added comments to main class; altered some method names