code cleanup
Merge remote-tracking branch 'Fishing-Records/master'
code cleanup