minor cleanup

removed spaces and useless defines, reordered includes