Refactored just a little