cleaning up a little. (first iteration. more to come...)