LPS-36376 Remove unused parameter
LPS-36376 Consolidate logic
LPS-36376 Change some variables to protected
LPS-36376 Source formatting