Modified a bit for formatting