Develop

Minor code cleanups