:metal: Code completely refactored