styling
Code quality

list comprehension is awesome shit! ;)
New code quality need some template magic