Rename class implementation variables to reduce the chance of accidental usage in a subclass. Replace cabin.error() with error(). General cleanup.