- fix makefile?
- cleanup code