More clear up, prettifying