Addressing some of the comments in the last pull request:
-Added some more Javadoc comments to the methods
-Bypassed the controller interfaces
-Removed some useless code