Refactor code and fix bugs with scuba fins