remove old comments and restructure a few things