Refactor, no more underscores fool