Removed unused dependency

And some minor code style changes