cleaning up formatting, etc...