Small refactoring, added logic for tidesViewController