Edited comments a bit