completed formatting of instance variables, cleaned up excessive code