Further Clean-Up, Refactoring Names into Convention. Man how inexperienced was I?..