code clean up for SQDrawers.java

Change-Id: I7ba27f324908547f1736eaff1de363b3e66d3c60