removed comments, few other random things