Revert "- some renamings and formatings sugested by JustCode"

This reverts commit 9b9e9fc8c11d87802c0dea3b7fee81b8caaac75c.