Codestyle updates and preparations for travis