Moved some code to inline