Conducted own code-review, ready for PR