Fix code style, put unused in the end

Change-Id: I7315b35049924d5067203a432584b8f29e5a1391
1 file changed