Refactor: Clean-up dirty code