Cleanup

Did some changes
Revert "Cleanup"

This reverts commit cc71935f4529a4207fe52eb7aaa9960a497611d8.
Merge remote-tracking branch 'origin/master'