Code formatting and added 'W'