Build: Addressed coding standard issues