Minor: aligned similar lines of code
Minor: fixed inconsistent indentation