Removing redundant import from same package and some cleaning.
Astyling the codebase: now 4 spaces indent and braces also in one liners.
Added @Override modifiers where necessary.
Reformatting javadoc strings, adding braces where needed for clarity.
Making codebase play safe by fixing all of Lint warnings.