Better formating of code