Cleaning and JavaDoc