Finished refactoring pick and ban, prettify