Formatting + removed unused stuff