Changed some functions to static inline