Client: Cleaned code