Updated
code cleanup
renamed
deleted
sorted help and beautified