Refactor my shiny metal ass