Code cleanup; add alchemy