Eclipse cleanup & formatter