Cleanup from Johnny's comments

Cleaned up the things requested by Johnny.