cleanup codestyle, more docblocks