Code

Clean up comments and remove (already commented) debugging messages