refactored a little stuff