Minor changes, comment removal