Fixed compile, corrected a bit the codestyle