format clean up as per eclipse formatter rules