Inlining

Inlining functions used in more than one source file