#48: groovy polished a bit