clean up indenting and have multple levels