move defines/comments a bit