Add comments. Cleanup a little