Solved formatting problems