cleaned up code, added build