cleanup, comments. TODO: create makefile