Better var naming
Better indentation
Going back to conditional & corrected init