Cleaned up the J4pClient code