Code Cleanup. Not done with FindBugs issue list yet.