Tidied up the code regarding `Procedure` model
Updated `Medication` model