Cleaned up instance variables