More consistent formatting and removal of unnecessary self(s)
Workaround RM-473
Organize code