Code style fixes

fixed formatting and some execs where single quotes are used when variables were present.