additional readability and general uniformity improvements