Entities updated with cleaner code and basic javaDoc.