fix comments and var names