removed most of the formatting, starting mostly from scratch