Cleaned up census code