Fix style and formatting issues

This also supressess unnecessary logging statements

Signed-off-by: Don Naegely <naegelyd@gmail.com>