Better code formating