Cleand up and added Comments
Revert "Cleand up and added Comments"

This reverts commit 1bb9a1eea7ebb9ea6e1104c570a19560f4440dbe.