Remove unnecessary object instance

Change-Id: I078a3a107d154bbcba7e1d49cbd6470b026ff869
Use attr and prop consistently

Change-Id: If650d07686cafb6fceba60186843b5599404846c