Code cleanup, readability