Refactor the Side module