Cleaned and updated the initial code checkin