Preparation for a UI.

Signed-off-by: Ben Corlett <bencorlett@me.com>
PSR-2 codesniffing.

Signed-off-by: Ben Corlett <bencorlett@me.com>