[Refactor] whitespace, strings

Do first refactorings to simplify the code, mainly adding whitespace for better readability and using strings instead of the pointer contructs.