Removed empty line
Better format for the if in E0016
Solved E0020