More presentable code