You should know better feliciaan

Complete code refactor.