Fixed issue #4
Minor code cleanups