Cleaned up code, began renaming boolean getMethods