Revert "Cleans the code a bit, compacts several lines"

This reverts commit ee10661c5fee7788d8b0209f37e3c91ec9ffee71.
Fix warnings in hoodle-core.