Cleaned up Javadoc typo and Imports statements to adhere more to projetcs guideline