Better names for helper functions, readbility fix

as discussed