wrapping long lines and using better function names