Couple small fixes
Refactored like I should have done earlier