Cleared checkstyle errors and updated constructor to use methods more.