More cleanup, added string print function