clean this stuff up a little bit