Refactoring/cleaning up random things...