removed comments and fixed include