Code formatting for Java Style
removed unneeded classes