Readability and some optimization