Code readability improved.