Refractoring...
Changed: Use Sun coding standard
Improvements here and there :)