commented and reformatted