[CLEANUP] Checksytle and formatting