Better code structure and comments for Docker check