Reverted change from shooly...

...as it was not working with the rest of the code and changing half of
it is not the priority right now.
Reformatted code to Java standard formatting
Removed TODO comment from main class as it was not used anymore


Signed-off-by: Co0sh <coosheck@gmail.com>