Working through formatting issues