moved instance attributes to a more appropriate location
5 files changed