Add indent settings to modelines
Clean up execute statements