More class addition and template cleanup.
Style update