Updates for code readability