added some formatting stuffs