more improvements readability-wise