Fixing review comments 2.2, 2.3, 2.4, 2.6, 2.7, 2.8, 2.9, 2.11, 2.12, 2.13