Renamed some stuff and removed newlines after non-func defines