Some refactoring, store executable bit