Refactoring - checkstyle warnings

Refactored the source to eliminate all checkstyle warnings. In the process I have replaced the .gitignore with a better version and placed it in the root of the repository