Refactored and modified the sample site