onSaveInstanceState & onRestoreInstanceState

Made a few checkstyle changes and implemented onSave/RestoreInstanceState.