Refractoring: Use Sun coding conventions