Refactored bird class. Cleaned up.