Added autodecorator
Better indentation