Cleaning up the code, deleting the stabs, useless comments.