Code & indent cleanup