Polish the code a little bit