Polish variable names and code readability