some formatting
+ some coding quality remarks
cheers!