Fixed indentation and removed unused stuff