Rewrite step function
Reorganize Telnet module
Small indent change