more basic style, taking out some unused code