More cleanup, tightening up of code/functionality