Beautify code a bit