Fix some identation problems and remove uneeded execfile