Fixed commandline parsing
+Code style