Code review + Improvements

This is just an intermediate commit. The open PR must not be merged, yet.