addressed comments in source