Some aestetic changes