renamed attributes and cleaned format