further refactoring of associated .el files