Clening up the code.