Basic code clean up
inline for the constants variables