Removed some of the unneccesary inline code uses.