fix indent, fix unused vars