code cleanup, reducing exceptions.