Cleaned up code in Server/Clientas well as the main package