Reformated and updated with markdown