Beautify code. Adjust/Enhance JavaDoc. Remove unnecessary code. Use static imports for utils.