Some comments/cleaning up