Updated and formatted project