Slight adjustment to make some methods more readablew