Code cleanup and method rename to remove use of reserved words