Formatting, merge issues, constants, clean up