Moves UIKit method redirection into its own class for reuse

Other minor cleanup