Maked code pretty ;)