trivial silliness and code cleanup