Refactor and fix :)