spaces fixed
remove unused vars