refactored some goodguy stuff