Reindent
Fixed bug, bracket and parren swapped in neighbor checks
Merge branch 'next_state_logic'