changed formatting to conform to mak's code better