Code tidy for inline functions