Small refactoring, implemented getting list and buoys info