cleanup, readability