yard docs, better variable and method names