Code and comment clean up