Minor enhancements, use understandable var names