Cleaned up college sort code