PLT-401 Refactored static strings and line lengths as per code review