Patch 7

Added suggestions by @weaverryan