LPS-49294-Constructors

This pull request include all of the formatting and logical changes requested in response to the previous pull request.