Minor refactoring
SO RF graphics