cleaned up rake file, associations made more efficiently