Refactor

Quick fix, didn't bother about the rest. :(