removed a few inlines