improved code readability;
improved code readability and consistency