Fix bug
Better formatting