Better format of the code