Add comments and little clean up