Code tweaks, readability improved, some minor changes

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>