Minor bug with object naming fixed

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Random clean-up

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
make the example slighly simpler

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
More cleanup

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>