Use enum instead of macros and fix code formatting