Just clean up the code