minor cleanup

minor code/comment cleanup (saved some code side)