improving readability and performance