Code and comment cleanup