Attempt to make class less complex