Reworked indentation with spaces instead of tabs