Added comments, mostly cleanup