[cleanup] Improved comments and codestyle