Prepare for release
Fixed code style issues