Code style changes (to maintain the old eclipse style