Reformatted more of the feedback, removed deprecated functions and unnecessary whitespace