Cleaned up source, fixed duplication bug.