Fixed variuous styling issues

Signed-off-by: Bryan <mattheyan@gmail.com>