Added more formating and comments