Optional removed and return moved
PSR-2-code-styling applied

Comments also removed