Minor code aesthetical changes