cleaned up a bit of code