Continuing work on the styling for first complete rewrite

Signed-off-by: Davinderpal Singh Rehal <davinderpalrehal@gmail.com>