cleanup code readability