Minor update

Cleaned up some code, rebuilt setup