cleaned up code, added traceur