Change inconsistent methods, adapt it to templates and remove whitespace between commas