refactor & size class changes