remix feature plus mis. style refactors.