Removed unused variable, made some formatting fixes