Made only some things smaller.. fixing
Merge pull request #955 from jdalphon/jd_issue948

Made only some things smaller.. fixing