Minor alignment issues and consistency maintained