minor beautifulization
some additional comments
locator: seems like a complete shit