cleaning up some rough edges