Remove comments. Add authors