Simplified entity locators

Signed-off-by: Tom Wright <tom@inflatablecookie.com>
Converted array declarations

Signed-off-by: Tom Wright <tom@inflatablecookie.com>