bare bones
code cleanup