whitspace/comment cleanup