Comply with PSR-0

Change-Id: I9979a5e710532464b0765f4c66f2d42ec550a813
fix ingroup tag

Change-Id: I853d04bc18b4ad5bf01a9dc74b30c4b7736d9f51