Enabled checkstyle and made appropriate changes / and some minor other code clean up