Code clean up. Started working on homogenizer. Etc.