Added automatic formating and basic error handler