Adding comments and cleaning up.