Clean up and commsnts