Some changes, this method would be called as static

Signed-off-by: Suki <suki@missallsunday.com>
Still moar changes

Signed-off-by: Suki <suki@missallsunday.com>