[issue-347[ Align code