Refractoring: Use Sun coding conventions
Changed: Improve some methods