Platform independent
Documentation updated
Needless code removed