[cleanup] Applied codestyle, improved comments