Code refactor, reformat, recomment