Refactor bicycle

Refactor #fixme changes for bicycle model, view, controller