Rename some symbols and labels
Operand refactor
Further refactoring
Comment change
Formatting
Fix bug with spaces at end of line