Cleaning code a little bit more.