Removing table and using code format