Formatting and implement services
Fix javadoc, add author