Comment cleanup

@chuckpreslar this one's for you