cleaned up a few rough edges