Standardize stuff and JavaDocs

Just some more contributions