Clean code a bit.