RFShare, code refactoring.