Better formating code