Aestetic changes, better context name