renamed inline-functions and reformatted whitespace