Clean up Constructor/Method/Field construction. am: b6f4c79b06

Change-Id: Idf409f946b1feb15cba4ad4db4aed29ccfe092fb