Code cleanup
Codingstyle cleanup