Tidied code and renamed drug.