removed some unnecessary checks
- Cleaned up a bit
Merge branch 'master' of github.com:brainpower/Maximum-Fish