#169 Cleaned up more from previous commit.