Formated source, added comments