Refactor :-(