Formatting and warning fixing