Cleanup of comments and variable/function names