Clean up logic

i'm so bad at :coffee:script