Refactored bunch of things