more style fixes - begun implementation of code style guide

Signed-off-by: Predrag Kanazir <predrag@arraystudio.com>