Fixed issue with installing Standard package in a second Model and minor source code formatting issue.