Some refactor & corrected some shadowing styles.