Cleaned up more loose ends