Minor formatting stuffs