Initial code re-style. Waiting on input