baby steps
some cleanup