PSR2 cleanup for Room