Code/comment cleanup