Beautify the code a little