Cleaned up poolpicker