few readablity improvements