! cleanup spacing, tabs, indentation, separation , etc ... 
Signed-off-by:Spuds <Spuds@192.168.1.125>
! curly brackets on ifs don't start newline
! wrap single line ifs in brackets

Signed-off-by: spuds <spuds>
! remove trailing spaces

Signed-off-by: spuds <spuds>
Merge pull request from @Spuds. Makes whitespace and other coding styles consistent. Update version to 1.6.3.