Code cleanup and pull existing players