Moved body of methods to default orginary functions.
Renamed for improved naming convention.