Beautify the code a bit