Implement #4 in StationList, clean up code & files