Minor changes, code readability