Cleanup - javadocs & imports