Reformat code and clean unnecessary #define

Nothing else is changed