TODO changed. Code style fixed