Some asethetic changes