1. Code styles fixed