More Code Cleanup

Just more refactoring to good naming conventions