some tab deleting and code style changes