Clean code a little bit.