eNET: General code cleanup
3 files changed