Homework 4: format, consts and improvements