Refactoring...cleaned up a few things