Formatted coded and added some todo's to the client app