Updated format and fixed compilation