remove unused variable
remove extra wrapping