Fix codestyle
Add parser and improvements