Apply code review feedback
Update resources