Code clean up. Add comments.