resolves #14 - final cleanup