One less tab

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

Signed-off-by: Suki <suki@missallsunday.com>
rename funcs to avoid possible issues with func naming

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