Code clean up: Move string literals to the left when comparing, use isEmpty to check for collection size, move trailing comments to a different line, use a constant variable in string literals used more than once

BMS-75

Reviewer: Crisjaira Villarino