Made various style changes as per Taras request