Cleaning up UI changes re: Neil's suggestions

Logs, comments, function names, etc.