Renamed some methods names for consistency, added ideas about improvements