fixed nothing, but refactored?