Addressed comments mentioned by Luke