Some Code style changes