use ruby constant syntax, improve end placement