Removing unused variable and some style tweaks