Updated and formatted source