removed unused variable
reduced variable-length
styling