Added forgotten files, fixed codestyle a little bit