Reformatted source, worked on comments