comments added and source cleaning started