cleanups, load command, code styles fixes