Whitespace fix
Convert #defines to a config struct.