Some better naming
Removes dirty lines