Polished source code
Tightened up imports
Added INLINABLE statements