code cleanup using Eclise's format etc.