cleaned up code, morning commit.