Code reformat to increase readability