some alignements and moved some code to helpers...