[cleanup] Improved codestyle