Removed unused variable + formatting