Cleaned up server client seperation