Minor cleanup
Code cleanup (less nesting)