Data Templates + made it more readable