[CLEANUP] Adjust code to coding guidelines