Added some defines
Added newlines