Implemented overridden client methods
Cleaning up files, removing swp files
Cleaned up old files