removed tabs + small cleanup of unnecessary code