Adding comments, cleaning up usings