Codestyle cleanup + update docblocks