cleanup and added edit for inlines