made some changes suggested in review
get rid of some unnecessary preprocessor usage

We are modern programmers with modern tools