Formatting
Try to make things work more consistently