clean code - fix end of line, remove unnecessary files
Build with jdk7, replace if structure with switch