Code tidy and ReadMe update