cleanup and code reduction